[minor] Update SLS configuration flow #1438

rawa-resul · 2025-01-12T22:21:26Z

Description

SLS related changes

Updated SLS flow
- Simplified
  - Install SLS in "ibm-sls" (shared) namespace
  - If namespace exists prompt for Upload/Replace the license file?
  - Otherwise, prompt for License file
- Advanced
  - Prompt for selection
    - Install MAS with Cluster-Shared License (AppPoints)
      - Sets namespace to ibm-sls
    - Install MAS with Dedicated License (AppPoints)
      - Sets namespace to either mas-{instanceId}-sls or --sls-namespace arg value
  - If namespace exists prompt for Upload/Replace the license file?
  - Otherwise, prompt for License file
License file secret is now created in the CLI within python/src/mas/cli/install/settings/additionalConfigs.py leveraging the self.addFilesToSecret function
Improved the slsSummary function to display variables depending on what SLS config has been chosen
Updated python/src/mas/cli/install/argBuilder.py to show SLS params based on config chosen
Added/updated SLS parameters under various tekton yamls
Separated out the DRO prompts within the configSLS as configDRO. Visually no change though.

Other changes

--image-pull-policy arg is now also passed on to interactive mode. This will help with development work.

ToDo's

Update docs
Lots of testing

Related PR's

Testing

All scenarios have been fully tested and verified on a fyre cluster

Simple

No SLS on cluster

CLI:

6) Configure AppPoint Licensing
By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster.

License file /mnt/home/entitlement.lic
Contact e-mail address [email protected]
Contact first name Rawa
Contact last name Resul

...

15.3) IBM Suite License Service
  Namespace ............................... Default
  Subscription Channel .................... 3.x
  IBM Open Registry ....................... icr.io/cpopen
  License File ............................ /mnt/home/entitlement.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement.lic
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Existing SLS on cluster - No license upload

CLI:

6) Configure AppPoint Licensing
By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster.

SLS auto-detected: ibm-sls

Upload/Replace the license file? [y/n] n
Contact e-mail address [email protected]
Contact first name Rawa
Contact last name Resul

...

15.3) IBM Suite License Service
  Namespace ............................... Default

Tekton Params:
sls_channel = 3.x
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = gencfg

Existing SLS on cluster - License upload

CLI:

6) Configure AppPoint Licensing
By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster.

SLS auto-detected: ibm-sls

Upload/Replace the license file? [y/n] y
License file /mnt/home/entitlement_2.lic
Contact e-mail address [email protected]
Contact first name Rawa
Contact last name Resul

...

15.3) IBM Suite License Service
  Namespace ............................... Default
  Subscription Channel .................... 3.x
  IBM Open Registry ....................... icr.io/cpopen
  License File ............................ /mnt/home/entitlement_2.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement_2.lic
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Advanced

Install with Shared SLS

CLI:

6) Configure AppPoint Licensing
By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster.

Alternatively you may choose to install using a dedicated license only available to this MAS instance.
  1. Install MAS with Cluster-Shared License (AppPoints)
  2. Install MAS with Dedicated License (AppPoints)
SLS Mode 1
License file /mnt/home/entitlement.lic
Contact e-mail address [email protected]
Contact first name Rawa
Contact last name Resul
IBM Data Reporter Operator (DRO) Namespace redhat-marketplace

...

24.3) IBM Suite License Service
  Namespace ............................... ibm-sls
  Subscription Channel .................... 3.x
  IBM Open Registry ....................... icr.io/cpopen
  License File ............................ /mnt/home/entitlement.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement.lic
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Install with Dedicated SLS

CLI

6) Configure AppPoint Licensing
By default the MAS instance will be configured to use a cluster-shared License, this provides a shared pool of AppPoints available to all MAS instances on the cluster.

Alternatively you may choose to install using a dedicated license only available to this MAS instance.
  1. Install MAS with Cluster-Shared License (AppPoints)
  2. Install MAS with Dedicated License (AppPoints)
SLS Mode 2
License file /mnt/home/entitlement.lic
Contact e-mail address [email protected]
Contact first name Rawa
Contact last name Resul
IBM Data Reporter Operator (DRO) Namespace redhat-marketplace

...

24.3) IBM Suite License Service
  Namespace ............................... mas-masdev-sls
  Subscription Channel .................... 3.x
  IBM Open Registry ....................... icr.io/cpopen
  License File ............................ /mnt/home/entitlement.lic

Tekton Params:
sls_channel = 3.x
sls_entitlement_file = /workspace/entitlement/entitlement.lic
sls_namespace = mas-masdev-sls
sls_icr_cpopen = icr.io/cpopen
sls_mongodb_cfg_file = /workspace/configs/mongo-mongoce.yml
sls_action = install

Rawa Resul added 11 commits January 11, 2025 22:27

[patch] Add custom python-devops

b2b466a

[patch] Add SLS options

9c13c79

[patch] Add further improvements

98488e9

[patch] Fix validator

769250b

[patch] Add NewNamespaceValidator

0d18cf3

[patch] Update custom python-devops

a51ceae

[patch] Fix invalid var referencing

16906ac

[patch] SLS flow improvements

55a44dc

[patch] Update custom ansible-devops and python-devops

afb5c76

[patch] Update SLS tekton definitions

1e4dc99

[patch] Add sls manual cert

52a6a4d

rawa-resul self-assigned this Jan 12, 2025

Rawa Resul added 18 commits January 12, 2025 22:33

[patch] Fix validator

0109b26

[patch] Fix bug in NewNamespaceValidator

091e5c7

[patch] Add SLSInstanceSelectionValidator

e67632a

[patch] Update SLS description

4b174fb

[patch] Fix sls cert flow

90981d4

[patch] Refactor sls flow

285125a

[patch] Update python-devops

5741879

[patch] Update ansible-devops

f0f534f

[patch] Improve SLS flow

b21877d

[patch] Set ImagePullPolicy to Always

2145680

[patch] Add image_pull_policy debug

98fad8b

[patch] Fix imagePullPolicy

96531e3

[patch] Check if args.image_pull_policy is not empty

6693934

[patch] Update custom ansible-devops

ddfb73c

[patch] Fix SLS simple route message

77ec4cc

[patch] Add SLS connection verification in external mode

3c610c6

[patch] Update custom python-devops

dc7a805

[patch] Improve SLS simple flow

69979eb

Rawa Resul added 19 commits January 15, 2025 00:51

[patch] Fix msg

d0aaf6b

[patch] Improve sls simple route

4a4c6e5

[patch] Update SLS advanced flow

38e6c82

[patch] Update custom ansible-devops

fefff8f

[patch] Add debug in sls role

5bcb840

[patch] Update custom ansible-devops

13344e7

[patch] Add encoding param to addFilesToSecret

d627e07

[patch] Remove b64decode from mounted secret

ca722e2

[patch] Remove b64 env var

eef95bb

[patch] Add non-interactive support for new SLS flow

de8cecf

[patch] Update custom python-devops

1ac32d9

[patch] Fix arg name

5cf1d3c

[patch] Fix arg parser exception

f9f853b

[patch] Fix argChecker

23f048d

[patch] Cleanup

6e928dc

Merge branch 'master' into sls-rr

83f8961

[patch] Update custom packages

acafe15

[patch] Refactor SLS flow

02a22f9

[patch] Undo some changes

4ba24e6

rawa-resul changed the title ~~[minor] Add support for various SLS configurations~~ [minor] Update SLS configuration flow Jan 23, 2025

Rawa Resul and others added 10 commits January 23, 2025 16:50

[patch] Add --dedicated-sls arg

2b3534e

[patch] Fix argBuilder.py

cec321f

[patch] Fix f-string error

bd53ef2

[patch] Fix SLS flow again

3d4ecff

[patch] Fix conditional statement

a789a9f

[patch] Cleanup

a7a0161

[patch] Minor improvements to SLS flow

f5b1f24

[patch] Improve argBuilder for sls params

858e681

Merge branch 'master' into sls-rr

3a79cde

Merge branch 'master' into sls-rr

9c32266

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[minor] Update SLS configuration flow #1438

[minor] Update SLS configuration flow #1438

rawa-resul commented Jan 12, 2025 •

edited

Loading

[minor] Update SLS configuration flow #1438

Are you sure you want to change the base?

[minor] Update SLS configuration flow #1438

Conversation

rawa-resul commented Jan 12, 2025 • edited Loading

Description

SLS related changes

Other changes

ToDo's

Related PR's

Testing

Simple

No SLS on cluster

Existing SLS on cluster - No license upload

Existing SLS on cluster - License upload

Advanced

Install with Shared SLS

Install with Dedicated SLS

rawa-resul commented Jan 12, 2025 •

edited

Loading